Remove unnecessary checks. (#148175, Morten Welinder)

Fri Jul 23 10:28:43 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreeview.c (gtk_tree_view_finalize):
	* gtk/gtkradioaction.c (gtk_radio_action_finalize):
	* gtk/gtkfontsel.c (gtk_font_selection_finalize):
	* gtk/gtkcellview.c (gtk_cell_view_finalize):
	* gtk/gtkcalendar.c (gtk_calendar_finalize):
	* gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove
	unnecessary checks.  (#148175, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 2d24bfd3d81b431a26f43b78ff431ae07b6146d4..9536b9fa5380c65db598d6ead7af1454f2be1308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 23 10:28:43 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_finalize): 
+       * gtk/gtkradioaction.c (gtk_radio_action_finalize): 
+       * gtk/gtkfontsel.c (gtk_font_selection_finalize): 
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): 
+       * gtk/gtkcalendar.c (gtk_calendar_finalize): 
+       * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove
+       unnecessary checks.  (#148175, Morten Welinder)
+
 Thu Jul 22 01:42:16 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d24bfd3d81b431a26f43b78ff431ae07b6146d4..9536b9fa5380c65db598d6ead7af1454f2be1308 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Fri Jul 23 10:28:43 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_finalize): 
+       * gtk/gtkradioaction.c (gtk_radio_action_finalize): 
+       * gtk/gtkfontsel.c (gtk_font_selection_finalize): 
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): 
+       * gtk/gtkcalendar.c (gtk_calendar_finalize): 
+       * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove
+       unnecessary checks.  (#148175, Morten Welinder)
+
 Thu Jul 22 01:42:16 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2d24bfd3d81b431a26f43b78ff431ae07b6146d4..9536b9fa5380c65db598d6ead7af1454f2be1308 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Fri Jul 23 10:28:43 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_finalize): 
+       * gtk/gtkradioaction.c (gtk_radio_action_finalize): 
+       * gtk/gtkfontsel.c (gtk_font_selection_finalize): 
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): 
+       * gtk/gtkcalendar.c (gtk_calendar_finalize): 
+       * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove
+       unnecessary checks.  (#148175, Morten Welinder)
+
 Thu Jul 22 01:42:16 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2d24bfd3d81b431a26f43b78ff431ae07b6146d4..9536b9fa5380c65db598d6ead7af1454f2be1308 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Fri Jul 23 10:28:43 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeview.c (gtk_tree_view_finalize): 
+       * gtk/gtkradioaction.c (gtk_radio_action_finalize): 
+       * gtk/gtkfontsel.c (gtk_font_selection_finalize): 
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): 
+       * gtk/gtkcalendar.c (gtk_calendar_finalize): 
+       * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove
+       unnecessary checks.  (#148175, Morten Welinder)
+
 Thu Jul 22 01:42:16 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): 

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 42af150dbc612e7e2db0b5f9f589b2de85970723..de0d40fec49e5284fcf1785b40bfd6c50c1d65d3 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -308,8 +308,7 @@ gtk_action_group_finalize (GObject *object)
   if (self->private_data->translate_notify)
     self->private_data->translate_notify (self->private_data->translate_data);
 
-  if (parent_class->finalize)
-    (* parent_class->finalize) (object);
+  (* parent_class->finalize) (object);
 }
 
 static void

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 88afc9b8debe23dbf6dbdb0e84631643e1ea63f8..c49eeb7286524d60061e05c8e4c4786ebb58c44d 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3094,8 +3094,7 @@ gtk_calendar_finalize (GObject *object)
   
   g_free (private_data);
   
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+  (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 static gboolean

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 2771c893e6d7b0523231ffa2615a5407f642c064..cfa82d5de256ea682a430144322535c47e4a2ac5 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -303,8 +303,7 @@ gtk_cell_view_finalize (GObject *object)
   if (cellview->priv->displayed_row)
      gtk_tree_row_reference_free (cellview->priv->displayed_row);
 
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+  (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 static void

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 06890deb3208c2e2a86a38e23e3c05a727a12703..b18200ebc0a938c286a403cede925e79db37df64 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -597,8 +597,7 @@ gtk_font_selection_finalize (GObject *object)
   if (fontsel->font)
     gdk_font_unref (fontsel->font);
   
-  if (G_OBJECT_CLASS (font_selection_parent_class)->finalize)
-    (* G_OBJECT_CLASS (font_selection_parent_class)->finalize) (object);
+  (* G_OBJECT_CLASS (font_selection_parent_class)->finalize) (object);
 }
 
 static void

diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c
index 8492a7ff16be18254d42f909385c926f8f2b399b..1efd12cc9c8f6fbfd30dbad4868577d018823afb 100644 (file)
--- a/gtk/gtkradioaction.c
+++ b/gtk/gtkradioaction.c
@@ -244,8 +244,7 @@ gtk_radio_action_finalize (GObject *object)
       tmp_action->private_data->group = action->private_data->group;
     }
 
-  if (parent_class->finalize)
-    (* parent_class->finalize) (object);
+  (* parent_class->finalize) (object);
 }
 
 static void

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9e3894814cd602d2afb9804f122eb67948cfd8c4..23f4336a7a3ebf837ca6667366ffa3437679172e 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1246,8 +1246,7 @@ gtk_tree_view_finalize (GObject *object)
 
   g_free (tree_view->priv);
 
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+  (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
 \f